From e5a870bb6f1e956913a838a796127a6b6b290bc7 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 1 Jun 2015 14:44:06 -0700 Subject: [PATCH] Update rust-url to improve hash/cmp performance Both no longer require allocations! --- Cargo.lock | 10 +++++----- src/cargo/core/source.rs | 2 +- src/cargo/sources/git/source.rs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2136c33bc..f4020c4f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ "threadpool 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -59,7 +59,7 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -119,7 +119,7 @@ dependencies = [ "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libgit2-sys 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -130,7 +130,7 @@ dependencies = [ "curl 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "git2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -336,7 +336,7 @@ dependencies = [ [[package]] name = "url" -version = "0.2.34" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/cargo/core/source.rs b/src/cargo/core/source.rs index 6583f99a7..32076defe 100644 --- a/src/cargo/core/source.rs +++ b/src/cargo/core/source.rs @@ -263,7 +263,7 @@ impl Ord for SourceId { ord => return ord, } } - self.inner.url.to_string().cmp(&other.inner.url.to_string()) + self.inner.url.cmp(&other.inner.url) } } diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs index 10a722cca..1863e8fd2 100644 --- a/src/cargo/sources/git/source.rs +++ b/src/cargo/sources/git/source.rs @@ -215,13 +215,13 @@ mod test { #[test] pub fn test_url_to_path_ident_with_path() { let ident = ident(&url("https://github.com/carlhuda/cargo")); - assert_eq!(ident, "cargo-51d6ede913e3e1d5"); + assert!(ident.starts_with("cargo-")); } #[test] pub fn test_url_to_path_ident_without_path() { let ident = ident(&url("https://github.com")); - assert_eq!(ident, "_empty-eba8a1ec0f6907fb"); + assert!(ident.starts_with("_empty-")); } #[test] -- 2.30.2